From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Sun, 11 Apr 2010 10:53:01 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~79
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1ac7833cb4fa0741de457f89316383f7cc1f28cb;p=emacs.git

Merge from mainline.
---

1ac7833cb4fa0741de457f89316383f7cc1f28cb